Fix #6025: SpecialImport.php -> wrong message when no file was selected

Patch by Jimmy Collins <jimmy.collins@web.de>

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 8eb5b0a..8f775fe 100644 (file)
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -300,7 +300,7 @@ it from source control: http://www.mediawiki.org/wiki/Download_from_SVN
 * (bug 6012) Update to Indonesian localisation (id)
 * (bug 6017) Update list of bookstores in German localisation files
 * (bug 5187) Allow programmatically bypassing username validation, for scripts
-
+* (bug 6025) SpecialImport: wrong message when no file selected
 
 == Compatibility ==
 

diff --git a/includes/SpecialImport.php b/includes/SpecialImport.php
index 91abcea..57a0ec7 100644 (file)
--- a/includes/SpecialImport.php
+++ b/includes/SpecialImport.php
@@ -615,7 +615,7 @@ class ImportStreamSource {
        function newFromUpload( $fieldname = "xmlimport" ) {
                $upload =& $_FILES[$fieldname];
 
-               if( !isset( $upload ) ) {
+               if( !isset( $upload ) || !$upload['name'] ) {
                        return new WikiErrorMsg( 'importnofile' );
                }
                if( !empty( $upload['error'] ) ) {